Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 23:30:50 +0000 (23:30 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 18 Jan 2010 23:30:50 +0000 (23:30 +0000)
commit849ac4c5bc67c2b58007b2ab49a20bd460461f3c
tree05cee9380156a902e764092af9f456dbeff6a25a
parent6b9d456cd31cc76cdcb11c438def2ec3343901ea
parent148d9d3f2cd8ad455c151ebfb50e104be9df4eb1
Merge from mainline.